From bd56a310711c3800e1dba9046bd29b7dc8bebe91 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Sat, 20 Aug 2005 09:36:15 +0000 Subject: [PATCH] We need to detect ioemu handled devices earlier and ignore them. Testing in blkif.py is too late. The check should be in createDevices. Signed-off-by: Arun Sharma --- tools/python/xen/xend/XendDomainInfo.py | 6 ++++-- tools/python/xen/xend/server/blkif.py | 11 +---------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 0dcfb5e462..74b8b6cc1d 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -23,7 +23,7 @@ Author: Mike Wray """ -import string +import string, re import os import time import threading @@ -383,7 +383,9 @@ class XendDomainInfo: def createDevice(self, type, devconfig, change=False): if type == 'vbd': - + typedev = sxp.child_value(devconfig, 'dev') + if re.match('^ioemu:', typedev): + return; backdom = domain_exists(sxp.child_value(devconfig, 'backend', '0')) devnum = blkdev_name_to_number(sxp.child_value(devconfig, 'dev')) diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py index 49d1fc5f9e..5bd89e8353 100755 --- a/tools/python/xen/xend/server/blkif.py +++ b/tools/python/xen/xend/server/blkif.py @@ -18,7 +18,6 @@ """Support for virtual block devices. """ import string -import re from xen.util import blkif from xen.xend.XendError import XendError, VmError @@ -200,7 +199,6 @@ class BlkDev(Dev): self.vdev = None self.mode = None self.type = None - self.emtype = None self.params = None self.node = None self.device = None @@ -239,12 +237,7 @@ class BlkDev(Dev): # Split into type and type-specific params (which are passed to the # type-specific control script). (self.type, self.params) = string.split(self.uname, ':', 1) - typedev = sxp.child_value(config, 'dev') - if re.match( '^ioemu:', typedev): - (self.emtype, self.dev) = string.split(typedev, ':', 1) - else: - self.emtype = 'vbd' - self.dev = typedev + self.dev = sxp.child_value(config, 'dev') if not self.dev: raise VmError('vbd: Missing dev') self.mode = sxp.child_value(config, 'mode', 'r') @@ -265,8 +258,6 @@ class BlkDev(Dev): if recreate: pass else: - if self.emtype == 'ioemu': - return node = Blkctl.block('bind', self.type, self.params) self.setNode(node) self.attachBackend() -- 2.30.2